Pla 1059

Merged PLA-1070 and cherry-picked Artur's changes.