Merged project branch changes
Merge branch 'master' into bachelor