fixed release version inconsistency
merge with upstream