sync with v4.5