Merge branch 'NIFTy_7' into fix_operator_test

12 jobs for fix_operator_test in 13 minutes and 33 seconds (queued for 3 seconds)