Merge "Fix node rejection crash" into nyc-dev