Merged qc_plot_bugfix