Merge pull request #3168 from Conceptual-Design/DynamoCore

Merge master  to DynamoCore branch