Draft: Resolve "Customer source changes" #1461

Closed
korina.cordero wants to merge 4 commits from 548-customer-source-changes into master

4 commits