clarified text
synchronized with upstream