Addressing comments in PR 782