Split up sessionlistener inte sessionlistener and whoislistener
Merge branch 'feature/split-sessionlistener' into develop