Merge upstream to branch safety-stop