NXP-10725: make checkin/checkout events consistent