DEVELOPER-902 refactor tracking code to async