Merge "Simplify matrix copy constructor/load" into mnc-dev