Added todo
Added comment
Added todo
Merge branch 'develop', remote-tracking branch 'origin' into feature/BACKLOG-983