Merge remote-tracking branch 'origin/NIFTy_7' into fix_deprecation_warnings

14 jobs for fix_deprecation_warnings in 13 minutes and 11 seconds (queued for 1 second)