Merge "Handle empty bigTexts more gracefully" into nyc-dev