cleanup picked versions
merge qa into develop