Fix build
Merge branch 'hotfix-1.2.3-build-fix'