Merge branch 'truncated-hmac' into development