Merge from master to master-updated

[ghost]

Thanks khmyznikov for opening a Pull Request! The reviewers will test the PR and highlight if there is any conflict or changes required. If the PR is approved we will proceed to merge the pull request 🙌