MANTA-28 misc double-checking
MANTA-28 fix off-by-one issues with END and SVLEN