Merged refs/pull/3533/head from repository cms-sw
Fix HI GT