JBTM-1728 and JBTM-1803