NLServiceLocator v1.0.1
Merge pull request #9792 from nikita-leonov/master

NLServiceLocator v1.0.1