Changes required to allow ARC conversion.
Merge branch 'ARC'