Fixed MAGN-4230 and 4233
Merge branch 'master' of github.com:DynamoDS/Dynamo