Fix service provider register
Merge branch 'fixprovider'