Merge pull request #1462 from shackbarth/23560-wh2