PR #1345: incorporate review comments
squash