Merge "Fix RNA crash" into nyc-mr1-dev