Merge branch 'vr/merge-base-doc'