Merge "Separate sniffing from session initialization"