2170 -- CHK14 : Fixed DrawPanel issues.