Merge branch 'sg/test-lib-simplify-expr-away'