6457 Commits (fix/3416-deleting-active-tab)