Merge branch 'vr/branch-doc' into next