Merge branch 'feature/task-1246' of github.com:tarunbhardwaj/nereid-project into feature/task-1246_b

Resolved conflicts