Merge branch 'main' into 20221215_maintenance