Merge remote branch 'ssvb/arm-fixes'