SVY-7274 add the listener in the start method so is only added once, not
every createSession() call
Merge remote-tracking branch 'origin/master' into SVY-6929-2