Fdb code refactor

Merged Vivek Naik requested to merge fdb_code_refactor into devbranch

Fdb code refactor

Merge request reports