Merge "Comment correction for Disambiguated function" into devel/master