Nuttx merge 5596

This merge is yet untested, starting the review process with this message.