Some more changes for monitoring service.
Merged conflicts.