Started working on BACKLOG-522