workaround for 1237
Merge branch 'develop-1.7.11' into develop-1.7.12