PLA-1321: addressing code review comments