Merge branch 'feature/CMatrix' into develop
Merge branch 'release/0.0.15'