MANTA-64 preparing for merge