New baselines.
Merged manually.
Baseline adapted.