Merge "Remove all usage of fmin and fmax" into mnc-dev