And fix a DB error By @meji46 Closes #16761 (cherry picked from commit 697749aafc)
697749aafc
hotfixes