Merge "Implement QS columns for different configurations" into main