[MERGE] fix session init

Signed-off-by: David Goulet <dgoulet@efficios.com>