Merge "Avoid extra parse/save delay for users with non-canonical parser options"