Merge "Easier baselines"