Merge pull request 'fix-bugs' (#3228) from zouap_static into V20221116