Merge "Fix handling of boolean fields"