Merge branch 'bwpipefix' into 'master'

BW Pipe Fix and Q_Scan Plot fix

See merge request !231
8 jobs for master in 20 minutes and 13 seconds (queued for 8 seconds)
latest