Merge remote-tracking branch 'origin/master' into pmg
Fix bug chart plugin
Refactor for serialization
Resolve conflict