build-698 review comments