Merge shader changes for indirect instancing (which should also fix the issues introduced by material changes)