Merge pull request #5870 from saurabh6790/fee_component_patch_fix

[fix] fee component rename patch fix