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