Code

Merge branch 'vr/merge-base-doc' into maint