Bugfix 2.0.3 Nachtrag
Merge branch 'bugfix' into develop