Merge branch 'features/JAL-2349_matrixvis' into features/JAL-2349_matrixvis_2112