fix conflict of cherry pick 983c1baf82f468d93fbaa206f282f109305fde6c