Merge "Better handling of trim/benchmark results." into mnc-dev