backport new tracking syntax from 70x to 62x