Merge branch '27143-role-fix' into dt-test
Merge branch 'identity-ec2' into dt-test