RP-1831: complete task