#29749 self-review comments impl