Fix MAGN-3244, MAGN-3580 and MAGN-3599
Merge branch 'master' of github.com:DynamoDS/Dynamo into FixingDefects
Merge pull request #1724 from Randy-Ma/FixingDefects

Fix MAGN-3244, MAGN-3580 and MAGN-3599