Fixes #3860 - automated discovery provisioning