Update to changes in the latest common-doc