SPR 25147, Merged null character fix from 4.1