Guillaume B2B

#127107

@will_finoak