Merge pull request #15127 from ahmedzaqout/patch-3

replace customer to department