upstream imports
dump support for OCTA formats older than 32