Commit [8142ac] Maximize Restore History

Merge pull request #2393 from r000n/staging

Staging - GUI fixes for upstream