sync with 5.3.25