Merge "Make RefBase more robust and debuggable"