Merge "Adds APIs for hub endpoint discovery callbacks" into main