Merge "Fix hun-to-shade corner clipping" into sc-dev