Merge pull request #1434 from shackbarth/23466-command