https://jira.playdom.com/browse/AML-102