Merge "Add more logging to confirm storage issue" into sc-dev