Merge branch 'features/JAL-2349_matrixvis' into merge/develop_JAL-2340_matrixvis