SI-8537 Puts SI-8157 fix under Xsource
Merge pull request #3703 from huitseeker/issue/SI-8537

SI-8537 Puts SI-8157 fix under Xsource