Agent terminates if requested port is busy
Merge remote-tracking branch 'origin/master'