Merge "Try to fix receiver crash" into nyc-dev