Merge "Fix rsg_generator.c to properly propagate NULL values."