Merge "Match the function hierarchy" into tizen