merged some branches
Merged in db branch