Merge of master into old scalability branch