PLFM-1994: code review changes, take II
Merge pull request #602 from bkng/develop

PLFM-1994: code review changes, take II