Yes, changes from this PR will be used as basis for PR to scala-lang. I'll hold it until IDE is published.