base64 cherrypick