Minor chart app updates
Merge remote-tracking branch 'remotes/origin/1.2-wip' into grunt