Merged branch arm changes r411:415 into trunk