Merge "Update size limits to match spec." into sc-dev