Merge pull request #14047 from rohitwaghchaure/enterprise_s_minor_changes

HR Fixes