MANDRAKE-21311

MANDRAKE-21311