Bug 18316: String changes