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