Internal changes. No functional change intended.
Changed the way boolean rules are queried during parsing. No functional change intended
Synced from master
Synced from master