sync with 1.8.4