Resolve "display unit in plots"

Merged Mohammad Nakhaee requested to merge 1541-display-unit-in-plots into develop

Merge request reports