Merge pull request #5661 from rohitwaghchaure/v7_fixes

[Fix] Patch salary component