Bugfix 2.0.10
Merge branch 'bugfix' into develop