Fixing crash with arc upgrade
Merge conflicts