merge changes from dev branch
merge tiny typo fix from dev