fix lazy session issue for customer controllers
Merge branch 'upstream-master'