Merge "Guard against crash in RTL." into nyc-dev