Merge "Fixed skippable evaluation in mode decision" into experimental