Interleaved property merge fix

Fixes #1742