Added/fixed extraData propagation.