Fix db:bootstrap task
Fixes #5431
Fixes #5432