sync with 5.3.11.patch5