Merge "Fix wrap property creation when truncating."