Merged Baseline 1.0.0