Merge branch 'refs/heads/feature-server' into develop
Consistent whitspace
Fix bad merge