Bug fix
Merge branch 'API_pipe' into webapp