Merge glasshouse pipeline with latest pipeline, there's still error when using glasshouse