Chart Type Change Fix.
Merge
Circuit Data Type Change Fix.