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