[arch-dev-public] Further patch for dbscripts