Merge branch 'release-v33.1.4' into develop
Create release v33.1.5 and simplify build
Merge branch 'release-v33.1.5'