Merge "Use strong pointers and scope"