Added JC-1487  resolution