Merge branch 'pu/100-remove-b2session' into next