Resolve "Plot support refactor"

Merged Mohammad Nakhaee requested to merge 1554-plot-support-refactor into develop

Merge request reports