Fixes #4871 - Add api for discovery