Merge branch 'pb/opt-cmdmode-doc' into maint