Merge "Keep a reference to the local matrix. Bug #3299324"