Merge "Revert "Update work challenge to align with material next"" into sc-v2-dev