https://jira.mediabrix.com/browse/AP-243