Cross merge DynamoRaaS stop-gap