Update to clar 7bf638b80