Merge "Inject auth token into tags"