Merge branch 'build-system' into next
Merge branch 'sh-error' into next