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