Fixing expression graph method.
Merge branch 'master' into v6-lsp
Fixed #3034 (1kb up and downstream).