Bugfix 2.0.19
Merge branch 'bugfix' into develop