GONRG-3345: fixed conflicts

Status Name Job ID Coverage
  Document
passed generate-docs #594147

00:00:07