Merge "Block cipher fixups"