Merge "BaseBlockCipher: removed TODO about checking a fix"