Merge maintenance/3.1.x into main following 3.1.1 release (#9618)