MANTA-28 fix for last checkin