[sr-dev] git:master:6b603c58: matrix: reformat exported structures