Merge pull request #3025 from Conceptual-Design/DynamoCore

Merge master  to DynamoCore branch
Merge master to DynamoCore branch