CORE-1505 task implemented