Drop expr
Merge branch 'drop-expr' into pu

* drop-expr:
  Drop expr