[REVIEW] Pre-merge review. This commit will have to
be squashed, but not before the end of the review process.