Merge "Correct docs based on recent behavior change"