Merge branch 'non-expr' into dev