Merge "Fix typo error in some descriptions" into devel/master