Port from nifty6 to nifty7

12 jobs for nifty627 in 12 minutes and 9 seconds (queued for 2 seconds)