include upstream changes
remove redundant dependency on alg_version