Merge branch 'hotfix/nosuchtable'
Cosmetic
Merge branch 'master' into develop