Merge "Attempt to fix receiver registering problems" into nyc-dev