Merge "Activate HMAC sharing check." into pi-dev