merge in 20d83c3 for dbCore