This commit fixes the broken pipeline thing.
Carefully review the necessary changes in the source code.
@mcastril @dbeltran