Upgrade to latest ki (with Underscore 1.7.0)