Merge pull request '#2525' (#2528) from zouap_fix into V20220718.patch