https://jira.wmg.com/browse/DEVP-2902 fix