Merge pull request #1695 from shackbarth/24202