Merge branch 'hotfix/1.2.1_3.1'
Bugfix in Archiving "feature"
Merge branch 'hotfix/1.2.2_3.1' into Development