1.2 - #8597

Backport text change to 1.2 branch.

Signed-off-by: Yan-Fa Li <yanfali@gmail.com>