Bugfix 2.0.16
Merge branch 'bugfix' into develop