Merge pull request #1433 from shackbarth/23479