Pick up modernisation commits since last release. To be used by Gauss Sim09 v49r25
cc: @kreps, @adavis