Fixes #6910
Merge pull request #6911 from mwerezak/he-pipes

Fixes #6910