Merge documatrix changes