Reverting to 2 secs
Handling uncaught exceptions
Merge branch 'master' into upgradeYcb