issue #20614: databaseonly and clientonly options