Merge branch 'nd/resolve-ref'