Merge "Properly check for malformed extras" into main