Merge pull request #3041 from G8XSU/followup-2957