* Restore skipped/failed keys. Fixes #37050 * Display custom stats. Fixes #37184 * Add version_added * Drop fallback, use self.get_option * Remove unused import