Core FDB updates

Merged Vijay Kumar Chauhan requested to merge devbranch into staging

Changes related to OR queries support in FDB

Merge request reports