Merge "Merge commit '452e206943f26af312bfe1d6a0b58402f9f9383e' into sc-platform-merge" into sc-platform-merge