Add more TODOs
CR fixes
CR fixes
Bug fix
Merge branch 'develop' into server_setup