Merge "Match the arguments type in 'max' function" into devel/master