JC-1607: minor changes