Merge "Fix regression in ModUnionTable RAM usage"