I've just seen 6.39.3 come into the bugfix train.
Can anyone confirm it includes the fix? Unless I'm blind I didn't see it mentioned in the system -> packages brief release notes.
Out of the office for another week before I can try it on a cloud core.