Merge "Address CR comments in I6c078ca3221e13cadf003f3504a7f796c7b18388" into sc-dev