merge of JPlotController conflicts