improve monitor-client support
Merge remote-tracking branch 'upstream/master'
improve monitor-client support