Appleid arm-elf contribution from Philip Blundell and merged with Catherine