Merge branch 'morandini/fix-issue-392'
Merge branch 'chris/fix-issue-385'
Clean up expression test and skip in parallel, which doesnt work by construction.
Merge branch 'martinal/fix-expression-test' into next