Merge "Purge StoreWriteQueue items to avoid system health issues" into oc-dev