3/12 DiscoveryConfiguration Add and groovy path change
Merge remote-tracking branch 'origin/kicho'