stop/restart answering problem
Merge remote-tracking branch 'origin/master'