re #8791 some basic plotting improvements
Merge branch 'feature/8791_Plot_improvements' into develop