JC-1753  minor changes