Merge "Use RecoverySession object to hide session IDs (redux)"