fix 'can't initialize problemSocket'
Merge remote-tracking branch 'origin/master'