Merge "Make sure interop path works with draw_fn"