Merge branch 'master' into implement_profile_mockup
Make following work and comment unused code
Fix conflicts