merged latest shader-related changes