merges latest master
Reduce calls to server for projects