Temporary fix to a bug which would cause the pipeline to only be treated as the last element. Really needs a better solution.
Merge branch 'router' into dev