Merge branch 'clang-frontend-variant' into release-3.15

Merge-request: !3650