[TIDOC-1314] Rework