Cross merging master changes into release branch

Please see [the original pull request](https://github.com/DynamoDS/Dynamo/pull/3139) for review details.