Merge "Add tests for rsMatrix*" into lmp-dev