Merge branch 'dev/christian'
Merge branch 'master' into dev/christian