[BACKLOG-623]