Merge "RESTRICT AUTOMERGE: Fix HMAC Compare time attack" into tm-dev