Merge "Fix typo error" into devel/master