Merge branch 'blas-pkgcfg' into release-3.13

Merge-request: !2631