Merge "Add special table formatting for Cipher."