Build 633 review comments