Merge "Replace deprecated "decodestring""