grid updates & QL agent
Merge origin/master
Merge origin/master