sync with 4.6.13