Sync with changes to Nuthatch