Merge branch 'maintenance/4.0.x' into merge-maintenance-into-main