fmt
Lock access to db session
Merge branch 'master' into builds
7.256