[Fix] namespace in service provider
Merge branch '1.2'