MANTA-69 pre-merge details