Merge skin fix (CHG-24452)