Introduce grammar patch from the simplify branch
#4019
+390
−147
Merged