NXP-14603: Fix multipart handling