Okay, so not a bug then. Thanks for your help and sorry I bothered you.
I can try and write a 6.0 migration guide PR if you think it would be useful.