Merge "[DOC BLD FIX] Correct reST field lists in docstrings"