meged upstream + db update