merge son-monitor update with upstream