Add test for #121
Merge branch '2.4'