Pushed segment annotations through to phase 3.8