Merge pull request '2022.07 stable' (#79) from develop into stable