zeug
Bugfix 1.12.17
Merge branch 'bugfix' into develop
Bugfix 1.12.18
Merge branch 'bugfix' into develop