sync with 6.x