Merge remote-tracking branch 'origin/master' into feature/6338_peak_statistics
Re #6338. Fixing usage test.
Merge branch 'feature/6338_peak_statistics' into develop