DOCS-3711 - reworked