Changes carried over from BclPipeline