Merge "Fix wrap property creation when truncating." into lmp-mr1-dev