Merge "Fix GC issue, fix local shader transformations."