FUSETOOLS-1052 - sync with JBTIS TP