Merge "Post-release doc fixes; Fixed a test"