Merge branch 'arm/common' into next