Merging gmatheu changes