Backports docs changes