Merge support for Encrypt-then-MAC