Merge pull request #1713 from shackbarth/23966