sync with 6.5.0-bugfix branch