issue #19456: Tweak
Merge branch 'master' of github.com:jrogelstad/database