Fixes #4373 - match renamed methods in core
Fixes #4871 - Add api for discovery