Adopt to K M6.2 stricter int->long conversion rules