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