Merge branch 'GoogleTest-type-param-suite' into release-3.25

Merge-request: !8282