MANTA-17 intermediate commit