https://jira.ninginc.com/browse/NING-13300