Fixed bug in autodiscover
Merge branch 'release/2.4.1'