3.12: Stick to the clutter-1.16 branch