Merge "Increase MAX_ATTRIBUTIONS to 10000" into sc-dev