Merge remote-tracking branch 'upstream/develop' into blas-ext-base-gf…

Merge remote-tracking branch 'upstream/develop' into blas-ext-base-gf… #559