sync with 71x/stable