Merge branch 'jx/branch-vv-always-compare-with-upstream'