Remove unused button type
Use custom logging lock in database module
Remove excessive locking in database
Merge branch 'master' into builds
7.230