Major commit Grunt and nodes upgrade