Fix an issue with user context when request locale is not found
Merge branch 'master' into PIM-1970