MANTA-20 add extra debug info