Merge DBBug To Master Tree

Make the Database to be Stable