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