2. RFC
This was suggested in #2384. I'm not sure it's a behavior we want, but if we do, here's a MR ...
(I left out the commit message until there's a decision on the behavior)
Fixes #2384