Hi Stuart, As requested - attached are 2 patch files, one covering util, the other text. I'm aware some fixes did go in recently, so if these patches are out of date and need re-spinning, then please let me know. Cheers, Martijn (on behalf of Adopt OpenJDK)