Are the patches merged? I’m not sure I see the service in master.  If they are, these patches may not be required. 

Thanks!