Merge pull request #5607 from rohitwaghchaure/v7_rfq_fixes

[RFQ] Enhancement and minor fixes