SI-8537 Puts SI-8157 fix under Xsource