Merge pull request #2769 from k0nserv/master

Change default to use ARC and specify on per file basis if it's disabled.