Merge "Workaround for custom TypedArray injectors"