Merge "Use number of rows from resources for QS" into sc-dev