Merge pull request '2022.09 stable' (#208) from develop into stable