I've uploaded this without the php-xml change given that it would probably require a separate bug and test case.
I've uploaded this without the php-xml change given that it would probably require a separate bug and test case.