On reviews for legacy/trac#27273, we noted a bunch of tasks to do post-merge. This is a parent ticket to track them.