Merge branch 'hotfix/gmt-fix'
non sessions, uppercased
Merge branch 'hotfix/jsonf2' into develop