Merge "Add missing changes from ARCH removal."