Merge from trunk:
* Workarounds for Intel compiler (fixes #8956)