JBTM-1632 updated to M3