354 - turning off auto-restart for default website
Merge remote-tracking branch 'origin/master'