Merge "Address comments and final cleanup from refcounting integration"