merge latest master to DynamoCore