Bolt: login + user sessions created
Resolved merge conflicts