Changes reflected by comments on 1528 pull request