Note Sphinx docs issue was backported