Merge "Don't create RefBase on the stack"