Merge "Relay extras from sorted cursor." into nyc-andromeda-dev