PLA-1273 code review changes