Merge pull request #2779 from G8XSU/2706-stop