Merge "Support for shader mutation"