Commit [bfa3fd] template-override Maximize Restore History

fixing merge with remote template-override