Merge "Ensure consistent representation of field deprecated status" into main