Merge branch 'backport-implicit-includes-cray-hlist'