Merge "Use correct context, resources and configuration in QS package" into main