This PR reimplements #6059 due to a gnarly git history that I couldn't manage to resolve. The reasoning for this PR remains unchanged, but I'll post the examples again so that you can see t...