Merge "Wait for data to be available before reading." into sc-dev