Improved startup/shutdown of tornado.
Fixed issues with notifications related to tornado.
Merge remote-tracking branch 'upstream/dev' into testing