All good points.

I'm going to make a few minor tweaks to your PR so that I can integrate it into 5.4. Please be aware that all the new behavior this jira adds will be considered incubating and that it may change over the course of the next few releases in the event others provide additional changes that are worthwhile to improve this new feature.