Cleanup refNode property
Merge branch 'refs/heads/set_refnode'