JMAN-12726

JMAN-12726