Merge "Merge sc-d1-dev 6958804 into master."