Merge "Protect against crash in memory details" into nyc-dev