MULE-7716 and MULE-7719