Merge branch 'backport-3.16-link-libs-config-case' into release-3.16

Merge-request: !4544