This change to ExpressionUtils appears to be unrelated to this issue - shouldn't this change be a separate JIRA/PR ??