Merge branch 'automate-oauth2-interactions-SOAP-1416' into next - file not included