Merge "Fade as shade expands" into main