Add an application service provider for the CLI app
(cherry picked from commit e63578e)
Fix a doc block