Merge branch 'main' into v2.17.x