Followup issue created: https://jira.ez.no/browse/EZP-21087