Merge remote-tracking branch 'glotzi/nut-update' into next