checked out 2.2.0 into master and locked deps down