TH-03 | replaced char pic
Merge remote-tracking branch 'origin/dev1.0' into dev1.0