Merged Sammy update 12 ARM part need more tests!!!