[UBI][HMAC] - Development commit