Fixed some minor code in service status.
Merge branch 'test' into dev