Update to latest v2.2 bootstrap