Added support for Discovery Issue #2227