Bugfix 1.11.1
Merge branch 'bugfix' into develop