#JC-1625  Fixed
Merge remote-tracking branch 'origin/master'