* Sync with branch app_restart