Merge branch 'matrix-loadbalance-to-more' into 'master'

Matrix loadbalance to more

There was a problem when having the global matrix and using load balance
to distribute it. This is fixed by the MR.

These changes should be cherrypicked to the release, too.

See merge request !28