non sessions, uppercased
Merge branch 'hotfix/jsonf2'