sync with 6.x
sync with 6.x