Merge "Potential fix for receiver leak problem" into nyc-dev