Merge "Update to support new shared_ptr returns." into main