Sync with exo parent. Add sonar section