Rearrange order so status is listed before the service.
Merge remote-tracking branch 'origin/master'