This is not needed anymore.
Merge branch 'feature/Issues/64/Enhanced_Archiving' into Development