ERT-570 - Plotting performance issues