Parity with Stephan's pipeline

[clin045]

Apologies, this was supposed to be a pull to our own internal repository.