Update default version, add 3.1.1 support

[#62742128]