Merge "Use Coder class"