merge latest changes

merge latest changes