Copy changes from master into mopo3ilo-mono