Merge branch 'next' into arm-port