Merge "Resolve Sphinx build warnings"