Merge pull request #3535 from henricm/fix-always-use-preamble-length