[SR-Dev] git:janakj/bdb: Merge branch janakj/bdb into master.