JBTM-1754 (updated)