Merge "Remove Q matrices" into main