Merge branch 'nrocha-experiment/30y-2020-intermediate-configuration-patch-13525' into 'experiment/30y-2020-intermediate-configuration' set salinity restoring to false See merge request !3