Merge "Handle split shade and alpha" into main