in compatibility mode, also support the old return packet format
Merge branch 'compatibility_mode' into HL