Any chance that a committer can apply the patch from https://issues.apache.org/jira/browse/TAP5-1778 somewhere in the upcoming 5.4 release. The issue has the patch, it addresses the problem at hand and in the worst case scenario has no effect on users who don't care about this.
Cheers - Alex K
