Merge "Remove Q support" into main