Implemented JC-1574 and fixed JC-1339