Fix for PE-1554.
Merge branch 'master' of git@github.com:Tesora/tesora-dve-pub.git into pe1529