Merge branch 'qbx-dsource-fix' into 'master'

qbx: fix block generator with additional source vectors

See merge request !84