Merge create session overhaul.