http://jira.aplana.com/browse/APLANATS-1657
http://jira.aplana.com/browse/APLANATS-1657