Merge branch 'jk/always-allow-large-packets'