JBTM-1364 and WFLY-1808