Fix styles
Fix build
Merge branch 'hotfix-1.2.3-build-fix'
Merge branch 'master' into devel