move the locale variable from the session to the

change tests as well
Merge remote-tracking branch 'origin/master' into 2.3