Take the fix for MAGN-5489 to the master branch

This pull request is to take the commits in the following pull request to the master branch.
https://github.com/DynamoDS/Dynamo/pull/3253