Deliberately putting as little as possible into this release, so that we
can validate the impact of these specific changes (PR #6395).