Baseline 3.7.0