gh-798-test

See #812 for discussion