JBIDE-18206 - CR1 n&n

JBIDE-18206 - CR1 n&n