Merge pull request '#2641,#2632,#2586,#2493' (#2667) from zouap into V20220815