MSK-157: Fix for different chart types.
Merge remote-tracking branch 'upstream/master' into upstream-master