Merge pull request #14460 from chdecultot/hotfix_customer

Customer timeline data hotfix