PLA-851 PLA-944 fix
Merge remote-tracking branch 'origin/PLA-851' into PLA-851