Merge "Make MeasureCallback signature .NET friendly" into devel/master