sync with latest changes in manual