Fix #604
...
Merge branch '2.4'