Merge branch 'sh/nommu' into sh-latest