Fix for PE-1571.
Merge branch 'master' of github.com:Tesora/tesora-dve-pub