This reduces a bit the Kokkos adherence
enabled an automatic merge when the pipeline for fd58fc22 succeeds
merged
mentioned in commit 4f033b2e