Update to 3.1.
PR: 60771 Submitted by: Munish Chopra (also requested by "0c", Fritz
Heinrichmeyer, Andreas Semborg and Johan Pettersson)