fix some problems of the intel compiler (rebase)

rebased version of !407 (merged)

Merge request reports

Loading