Merge "Fix HUN pinning in split shade" into main