SPY-221 Syncing up to the actual Shark 0.8.0 release