[B-52097]: committing gateway client