track (cherry-picking from commit e67cee5e117f08fdfe4b370a17aaf60f898e72ce)