tern: apparently we have 0x10 bytes too
Merge remote-tracking branch 'origin/staging' into staging