FUSETOOLS-1052 - sync with JBTIS TP
Merge pull request #123 from pleacu/fusetools-1052a

FUSETOOLS-1052 - sync with JBTIS TP