Merge "add Base64InputStream"