Jon B.M ab403f4551 Merge 'bdb_dev' into bdb 3 lat temu
..
Main ab403f4551 Merge 'bdb_dev' into bdb 3 lat temu