[MERC-362] MERC-362