Merge pull request #2916 from castillofrancodamian/nut