Updates for expressions to improve robustness and support functions, external context etc.

Merged Mark OLESEN requested to merge feature-expr-improvements into develop

Merge request reports