IsoTrack: bugFix and backport  from 7X