Merge branch 'ParameterExpansion' into pierlis