JC-1170: merge to master
JC-1170: Minor fix