Apply patch from RT #75232 - fix embedded newlines