Bugfix 2.0.16 Nachtrag2
Bugfix 2.0.20
Merge branch 'bugfix' into develop