http://jira.aplana.com/browse/APLANATS-1726
http://jira.aplana.com/browse/APLANATS-1692