Sync'd to Shark 0.8.0 release.