Merge "Revert "Implement QS columns for different configurations"" into main