Already done, see https://jira.ez.no/browse/EZP-20579