Merge "Use make functions to convert a text to lower case" into oc-dr1-dev