NR-617 : Test and fix media archive because of security changes / refactoring

quick fix
Merge remote-tracking branch 'origin/devel' into devel