PLFM-1648: Code review changes
Merge pull request #378 from bkng/develop

PLFM-1648: Code review changes