Carry over changes from Bcl Pipeline