merge latest changes from roots repo