build-804 review comments