Merge pull request #3196 from Conceptual-Design/DynamoCore

Merge master  to DynamoCore branch
Merge pull request #3237 from Conceptual-Design/DynamoCore

Merge master  to DynamoCore branch