Merge "Improved documentation (clarify on issue 8727)"