Charts and graphics history updates.
Merge remote-tracking branch 'upstream/dev-master' into dev-master