Merge "Making 'dicttool header' output format version"