http://jira.aplana.com/browse/APLANATS-1824
http://jira.aplana.com/browse/APLANATS-1815