Merge branch 'jk/cherry-pick-root-with-resolve'