BACKLOG-989 Added todo