expr, atomic-expr, insert, type definition
Merge remote-tracking branch 'origin/master' into eliutt-branch