Merge "ASL update fields to finalized declarations, part 1" into main