...
Add a unit test for #626
Merge branch '2.4'