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

12 jobs for nifty6tonifty7 in 13 minutes and 37 seconds (queued for 1 second)