backport #626 test
...