Merge "Move ConverterRule class to its own file"