MANTA-17 update formatting