Details
Description
I am going to address this for 4.7 as it is exposed by a unit test (that I wrote for 4.7 but then commented out the lines that don't work due to this) and is the same area of code I'm working on - However, I am unsure if 4.6 is affected (& not necessarily planning to check at this stage)