JC-1497 Added comments. Fixed formatting.
Merge remote-tracking branch 'origin/master'