@rafael  or @tomo 

Please feel free to merge in so we can have deployment tests working back again.

/reviewed-on !101