sync with zxing main