Merge pull request #1751 from shackbarth/24344-2