Merge branch 'callout_auth'