Merge branch 'next-s3c-machines' into next-s3c