JC-1395 Fixed code review comments.
Merge remote-tracking branch 'origin/master'