PhilipW I'm leaning towards closing this issue as out of date.

It cannot really make substantial changes to 5.4 to fix the issue, especially with it being fixed in 6.

Please drop a note to the projects you use to push forward the move to 6.

Do you agree with that?