Merge "Update error prioritization in PreAutInfo" into sc-dev