Fix docs.
Merge topic 'backward-compatibility' into next

58ca84f5 Fix docs.