Expression tool first example
Merge branch 'master' into topic/expression_tool