Hotfix for Intel compilers
#3975
Merge commit 'dba79131a354b5f7d73b4ccc118479f7d95b790a'