Merge "Update bcc's whitelist with convert_halfN(halfN) variants"