Merge pull request #1716 from shackbarth/24200