Ready for review: https://sbprojects.statsbiblioteket.dk/jira/browse/AVISIMPL-230