removed v2 branch and merged with dev