First solution
ready for review
Merge remote-tracking branch 'origin/APD-685_EMA' into develop
Merge branch 'develop' of https://github.com/Deutsche-Digitale-Bibliothek/apd.git into develop