small cleanup
Merge branch 'develop' into feature/Danny_1
Merge branch 'feature/Danny_1' into develop