[ET Trac] #2615: Riemann release not compiling with intel 2021.6.0