Missed out changes while rebasing - resource_tracker