Mask mode: Use mask_add_len in hybrid parent modes. See #837