Merged from multiversion and removed some unnecessary imports