Merge branch 'rework-restapi' into dt-test
Merge branch 'identity-ec2-tests' into dt-test