Merge "Snap for 7083521 from 164369e95d5be30d6887b60bf893ecc7845354e0 to sc-d1-release" into sc-d1-release