12 Commits (nc-fix/wh-followup)