MANA-21879

MANA-21879