Bugfix 1.12.6
Merge branch 'bugfix' into develop