manually merge the iam_oauthv4_alternate_solution branch