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

12 jobs for constant_support_pa in 13 minutes and 15 seconds (queued for 3 seconds)