Merge "Handle dream restart"