Merge "Fix reclaim sessions (DO NOT MERGE)" into oc-dev