MANTA-28 format refresh
MANTA-28 bugfix