Merge "BUG-731: do not do String.toString()"