ARM: Merge for-2635-4/ts-machines

Merge branch 'for-2635-4/ts-machines' into for-2635-4/partial1