Rsessionsadapt

Yesterday I realised that these changes never made it to the develop or 2.6.1 branches