update mathias
Merge branch 'release/r6'