Merge pull request #5330 from hnyman/nano291