Merge "Fix documentation to match potential code"