MANTA-28 fix issues resulting from work on small-event assembly