#2382 done with code for all dbs. need to test