Merge watch_sessions with master