JBTM-1457 & JBTM-1456 (master)