Fix payload corruption
Tabs
Retab
Land #2152, @Meatballs1 fix for [SeeRM #7923]
Fix indentation