MANUEL-12828

MANUEL-12828