Merge "Fixed possible heap corruption in EffectDesc"