Merge branch 'implicit-includes-cray-hlist' into release-3.15

Merge-request: !3532