Merge "Handle case where ClientMonitors should not be started"