Today
Merge from console_recover_changes