Issue #24702 - correctly handle source id changes
Merge pull request #516 from krauseo/issue24702

Issue #24702 - correctly handle source id changes