Add rate-limiting `merge-more` TODO
BREAKING: Clean up blocking: `block-while-table-status` -> `table-status-watch`.