Commits needed to fully bootstrap crab SW