Merge "Fix regression in ModUnionTable RAM usage" into nyc-dev