small tweaks
Merge remote-tracking branch 'origin/PLA-1875' into PLA-1875