Merge pull request #1746 from shackbarth/4601