Merge "Fix refcounting bug"