[JBTM-2110]