Merge "Adds CONTAINER_QSB to be used for QSB data." into sc-dev