sync with pr-26