Merge pull request #13455 from Achilles-96/Issue-#5827