#29755 review comments