Merge branch 'ps/common-info-doc' into maint