Merge branch 'feature/matrix'