I'm going te merge the request, then we need to develop an mechanism for opt-out or something similar