JBTM-2114 backport JBTM-2105 to 4.17 branch