Merge "Add rows config for QS and QQS for bc25" into main