Fix plot
Merge commit 'c6b5b6edc' into develop