Fix IBC-GPM when --EnableTMTools=0

Merged Yang Wang requested to merge wangyang.cs/ECM:IbcGpmFixForTmOff into master

Fix for IBC-GPM when --EnableTMTools=0

Merge request reports