Manual merge of master into xovis branch