Merge branch 'maintenance/4.0.x' into main following 4.0.1 release (#10668)