Pla 1153

Code review for PLA-1153