To be clear, it can be discussed further, but this PR is fine to be merged (and is now merged).