issue #20254: fold in global database to instance databases