Updating so that MAC encryption uses same IV on both ends
Merged