extract method: annotate newly created method @Nullable when applicable (IDEA-76767)
extract method: fix name conflicts at method call site
deep refactorings: expand first level; disable and check root node
Merge remote-tracking branch 'origin/master'
Cleanup (testdata file names fixed)