[#2474] Tweaks to new legacy session feature