Nuttx merge 5527

Under review.