pull in #784, add tests for this command (currently there are basically none)
pull in #784, add tests for this command (currently there are basically none)