Merge after partial cherry-pick from plottingDesignIdea