Merge branch 'mr_corrections' into 'NIFTy_5'

fixes

See merge request !284
11 jobs for NIFTy_5 in 8 minutes and 53 seconds (queued for 2 seconds)