Merge master to DynamoCore branch