Case 12643
Merge with Pharo 30697