sync with 2.17