FUSETOOLS-1054 - migrate 7.2.x fix

Migrate 7.2.x fix to master.