Merge pull request #7696 from khatrijitendra/patch-1

[Fix] "type" and "rate" fields