Integrated upstream 1.5.0-RC1