1961 Commits (bugfix-slot-update-2)