Bugfix 2.0.18
Merge branch 'bugfix' into develop