Hotfix for Intel compilers
#3975
Merge commit '6100fd381f36f7f9b76dbc88e59a6487ba1aba5f'