updates from insights
Merge insights:/home/rmichael/environment