cherry with x

(cherry picked from commit c9ed634612f9f5f31db666d348b88a1563aa31fe)