Add: Asset FDB and merged bucket type

Merged Akshay Bharambe requested to merge Add_AssetFDB into devbranch